additional fix for 19