Possible solution for #33