solved bugs!