Fix for faulty module creation/deletion.....