fix after support from sam the awesome