Small bug fixing - git #27