* FIX: Regression introduced update, #53