Improving implementation of #289