Issue163

Solution for issue #163.