Fixing crazy @-bug