Changed to work with Assemble 0.4