Added #1014

Feel free to improve.