#37 bug fixing -> algorithm_tools to replace