Fixed stuff again