this should fix the wrong behavior