Fix #260
Fix #250