Fix for a2b2e16