fixes/hacks