Minor bug fix #27