Fix #3 & Fix #4