Fix #76, thoughts ready