Fix #40-45