Temporary solution to Issue #3