! bugfix, did not work properly