fixed #1. Need advice