Fix #400