Design Time fix