Changed the order of the arguments to attempt to address issue #15