Finally, got rid of nasty InvalidOperation exceptions occurring here !