Regression fix for asesthic reasons, fix 2