Bugfix on binary operations