Fixed open/close method calls