adds some hacks
minor fix