Fix for buildpreview