fixed Justin's screwups