Temporary fix for boundary movement