Workaround for minor design bug