Revert "Bug Fix #1"

This reverts commit 8fc87fdfadef87a19b1d08e8a8d2a97eefba8c2d.