Final fix applied to #5