Issue299 - fix #299