Method of manufacturing an optical device, and an optical device, the optical device having one or more layers (13) of quantum-dots located in-between barrier layers (12). A spacer layer (15) is grown on a barrier layer (12), such that the spacer layer (15) is adapted for substantially blocking strain fields induced by quantum-dot layers, thereby producing a smooth growth front for a subsequent barrier layer (12).