Fix for 'str expected'