Please do enter a separate issue. Don't want to forget about anything :)