potential fix for 1769

#1769 

@bartv2 @butonic