Fixing some small regression