fix for 61401078