Better handling of positioning