Fix for Github NumberFormatException