not quite fixing that bug.... soon...