fixes to make it work