Fixing a long standing bug once and for all
1.9.1