This should not be a problem anymore I think
Removed commented stuff