Fixed the pushing issue with a hacky solution