Cleaned code. No more warnings
Codewised fixed #78. But could never reproduce.