Fix bug #1 and #2