Hot fix for sorted properties