couple of quick hacks until I can port my project