Fix issue #19

This is considered to be a bug that has been already fixed for the internal scalr repo.