fixing Justin B's work