Noticed possible issue on line 115, see comment