#1149 Possible solution, should be reviewed