issue #18. Remakes are done!