Change method definition to solve issue #66