temporarily deactivated this function, see issue #25