fixed move and push rules