fixed the bugger once and for all