Addressed fatal error from Issue 13