I have the same problem.
I play this game the second time and forgot to take the glas in Ed's room first.
I got the pin first and this was apparently a mistake.
When Bernard does the magic trick again (after he took the pin already) and is alone in the room, the glas is not on the table - even I have not taken it already.