Temporary fix to exception