Fix for false imputation issue in #529