fix for 15780, 15788, 15832