Fix for exception