#834 as of @ntsikerdanos suggestion