Fixed NullPointerException...