fixed module dropped, note sure if totally working now...