fixed issue described in #1225 but still remains for others i.e. todo