REALLY fixed extended commands this time...