fix ceiling again after merge