Fixes to previous fix :-(