Quick Fix for issue #70