fixes bugs caused by adding 5900