Possible solution for #317 [gh#317]