Fix #1, close calls were added