#37 bug fixing in progress