temp fix for issue #1. Though this is temporary, it works and is correct!