fixes for potential preparation
corrected