bug workaround notice added