Fix #1 with appropriate conf and preempt bug fix