Bug is now replicable
Final touches