Troubleshooting commit

WARNING: doesn't work as expected. Will be fixed in next commit.