Bug Fix: Closes #222