Quick fix for assemble bug