Fix for Marek