Fix submitted by @inspiraaz - issue #92