Bugfixing (modifications are pasted now)