Fix #31 - Replace mixed classes and scriptlets