Fixed maybe #61.