workaround for some bugs I found