Temporary Fix #544