Fix #3 and #4