previous fix was bad
fixed problem 1 once and for all