temporary fixes, Adrian's catalog