Fixes issue#2 by lojack!

This partially reverts commit 4f6b8afad04f8f83d1bc56b22d1118c3866c1419.