Preparation for a later fix