Bugfix, attempt at debug
Bugfix, attempt at debug