Fixing #928 properly