Fix bug with singleton method.