and though bugs are the bane of my existence, rest assured the wretched thing will get the best of care here
Created by: esyuleyman
-additional fixes for NY-10117 issue
