Trying to fix some bug, failing.