Fix for last issue