Not sure this is better. Both ways are not ideal...