Fixes #42 rollback changes because giving sometimes problems