Possible solution for #16 finally :)