Port 89af12c (Fixes #289)