Fixed #8 - changed order of build