Temptative fix for issue #148, but I feel like I'm breaking an improvement instead of fixing a bug!