Temporary Fix #792