Fixed errors in deconstruction