Should work correctly now