Fixed tips generation - isssue #45