get solution to #1038 to actually work