Fix #264
Update with macaron