Fixed ANOTHER BUG!!!