applied jake’s issue #898