Implement #252. Why not, sounds logical...