Fixed attack system again