One more take on proper re-positioning after reshape