merge derp/build fix