propagate bugfix to original classes