fixing push/pop locatio usage