Initial fix for push issue (fixes #40)