Fix bug in insert composition
cleanup