Should work correctly now.