Some more changes concerning #871
Please check