Temp fixed for issues #2 and #3