last fix for #72 caused some lag