Developer PEBKAC - Fix error #588