Fix issue #19, accept as argument too