More work.. nasty bug though