Fix for issue #13
Working with new profiles too.