finally fixing things properly #3